From 5aeaa2f52f4b8380f3f9591538ce8b1a12b9d902 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Tue, 9 Aug 2011 18:06:43 +0100 Subject: [PATCH] ACPI ERST: Revert change to erst_check_table() to be more permissive. Permits tables that apparently Xen cannot handle (causes boot failure on many systems). Signed-off-by: Keir Fraser --- xen/drivers/acpi/apei/erst.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/xen/drivers/acpi/apei/erst.c b/xen/drivers/acpi/apei/erst.c index e012cd39e0..eb666a6fca 100644 --- a/xen/drivers/acpi/apei/erst.c +++ b/xen/drivers/acpi/apei/erst.c @@ -715,13 +715,7 @@ int erst_clear(u64 record_id) static int __init erst_check_table(struct acpi_table_erst *erst_tab) { - /* - * Some old BIOSes include the ACPI standard header in the ERST header - * length; new BIOSes do not. Our check allows for both methods. - */ - if ((erst_tab->header_length != - (sizeof(struct acpi_table_erst) - sizeof(erst_tab->header))) - && (erst_tab->header_length != sizeof(struct acpi_table_erst))) + if (erst_tab->header_length != sizeof(struct acpi_table_erst)) return -EINVAL; if (erst_tab->header.length < sizeof(struct acpi_table_erst)) return -EINVAL; -- 2.30.2